pointerfocus: Don't include gtk.h

Also fix up gtktypes.h to include the required glib.h for G_BEGIN_DECLS
and gtkdnd.c to include missing includes.

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 14d9c34645ecd1e5ed3ef7fda85928c18fb9a600..a266845e2e0faf9bff284b501295ce2b668d0c03 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -24,27 +24,24 @@
 
 #include "config.h"
 
-#include "gtkdnd.h"
 #include "gtkdndprivate.h"
-#include "gtksettingsprivate.h"
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "gdk/gdk.h"
-
-#include "gdk/gdkcontentformatsprivate.h"
 
 #include "gtkdragdest.h"
 #include "gtkimageprivate.h"
 #include "gtkintl.h"
-#include "gtktooltipprivate.h"
-#include "gtkwindow.h"
+#include "gtkmain.h"
 #include "gtkselectionprivate.h"
+#include "gtksettingsprivate.h"
+#include "gtktooltipprivate.h"
+#include "gtkwidgetprivate.h"
 #include "gtkwindowgroup.h"
 #include "gtkwindowprivate.h"
-#include "gtkwidgetprivate.h"
+
+#include "gdk/gdkcontentformatsprivate.h"
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
 
 /**

diff --git a/gtk/gtkdndprivate.h b/gtk/gtkdndprivate.h
index 5691451e3096b621dbf258c39e14b0dd20762445..854316ce5d2f11ee76b67a3be67d234c0b0fe4dd 100644 (file)
--- a/gtk/gtkdndprivate.h
+++ b/gtk/gtkdndprivate.h
@@ -19,12 +19,12 @@
 #ifndef __GTK_DND_PRIVATE_H__
 #define __GTK_DND_PRIVATE_H__
 
+#include "gtkdnd.h"
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkdragdest.h>
-
+#include "gtkdragdest.h"
 #include "gtkimagedefinitionprivate.h"
+#include "gtkselection.h"
+#include "gtkwidget.h"
 
 typedef struct _GtkDragDestSite GtkDragDestSite;
 struct _GtkDragDestSite

diff --git a/gtk/gtkpointerfocus.c b/gtk/gtkpointerfocus.c
index 5229e39e12f6c7bb6c226579cade41f8d8093658..6c2c90f455369d1d1b70547c517023dede495d46 100644 (file)
--- a/gtk/gtkpointerfocus.c
+++ b/gtk/gtkpointerfocus.c
@@ -15,6 +15,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
 #include "gtkpointerfocusprivate.h"
 #include "gtkprivate.h"
 

diff --git a/gtk/gtkpointerfocusprivate.h b/gtk/gtkpointerfocusprivate.h
index c7ffd90f979a4cf1b290ea1a903866e17670b94a..02ab6e5c82b88eb6e0b3ff7dd1bc3d8f21216535 100644 (file)
--- a/gtk/gtkpointerfocusprivate.h
+++ b/gtk/gtkpointerfocusprivate.h
@@ -18,7 +18,7 @@
 #ifndef _GTK_POINTER_FOCUS_PRIVATE_H_
 #define _GTK_POINTER_FOCUS_PRIVATE_H_
 
-#include <gtk/gtk.h>
+#include <gtk/gtktypes.h>
 
 typedef struct _GtkPointerFocus GtkPointerFocus;
 

diff --git a/gtk/gtktypes.h b/gtk/gtktypes.h
index 07b8f4e1520179a5f8c511fedf0cdbfaae547f09..c38a84516574cf94532514cab9256b384d738cbd 100644 (file)
--- a/gtk/gtktypes.h
+++ b/gtk/gtktypes.h
@@ -29,6 +29,8 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#include <gdk/gdk.h>
+
 G_BEGIN_DECLS
 
 typedef struct _GtkAdjustment          GtkAdjustment;